Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
authorEli Zaretskii <eliz@gnu.org>
Fri, 27 Nov 2015 11:11:57 +0000 (13:11 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 27 Nov 2015 11:11:57 +0000 (13:11 +0200)

Trivial merge